Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Sat, 12 Feb 2011 23:40:43 +0000 (18:40 -0500)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 12 Feb 2011 23:40:43 +0000 (18:40 -0500)
commit8f59e3cc812743f3ca77b15a64aeb0a4499dd6aa
tree690a71ba202a3740e5c4e6b6a0da520e9c087d6b
parent252f45c4910cd18c6165e5cf8a2e4ad0d0dcded6
parent69979ce39c8c50da21159d777d4fc11393804b79
Merge changes from emacs-23 branch
20 files changed:
doc/misc/ChangeLog
doc/misc/sc.texi
doc/misc/url.texi
etc/ChangeLog
lisp/ChangeLog
lisp/emacs-lisp/checkdoc.el
lisp/emacs-lisp/cl-loaddefs.el
lisp/emacs-lisp/cl-seq.el
lisp/emulation/cua-base.el
lisp/faces.el
lisp/gnus/ChangeLog.2
lisp/mh-e/ChangeLog.1
lisp/simple.el
lisp/textmodes/reftex-index.el
lisp/vc/ediff-mult.el
lisp/vc/ediff-ptch.el
src/ChangeLog
src/nsterm.m
src/terminal.c
src/window.c